From 41a500c90a85d4d13bb76ceab01ada9c3abff7c6 Mon Sep 17 00:00:00 2001
From: Juanma Barranquero <lekktu@gmail.com>
Date: Fri, 16 Apr 2004 19:33:45 +0000
Subject: [PATCH] *** empty log message ***

---
 src/ChangeLog | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/ChangeLog b/src/ChangeLog
index 35ebc439bdd..cbd5803637d 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2004-04-16  Juanma Barranquero  <lektu@terra.es>
+
+	* xdisp.c (try_scrolling): Make sure `scroll-conservatively' is
+	not too large before computing how much to scroll.
+
 2004-04-14  Luc Teirlinck  <teirllm@auburn.edu>
 
 	* fileio.c (Fverify_visited_file_modtime, Fvisited_file_modtime):
-- 
2.30.2